(Fx_open_connection) [NO_XRM_SET_DATABASE]:

Don't call XrmsSetDatabase.

diff --git a/src/xfns.c b/src/xfns.c
index 4ff2e1ab5c8977fbbe53a33208110f90ee4d01ab..1afdb33a5c878e76437b3ab2bfde3995a3a24d32 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3447,7 +3447,7 @@ arg XRM_STRING is a string of resources in xrdb format.")
   else
     xrm_option = (unsigned char *) 0;
   xrdb = x_load_resources (x_current_display, xrm_option, EMACS_CLASS);
-#ifdef HAVE_X11R5
+#if defined (HAVE_X11R5) && ! defined (NO_XRM_SET_DATBASE)
   XrmSetDatabase (x_current_display, xrdb);
 #else
   x_current_display->db = xrdb;